From 77cb1af79db80af089e1da151362fda735b05df1 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 18 Jan 2008 15:46:58 +0000 Subject: [PATCH] do_callback_op()'s second argument can be const allowing the guest to declare these (mostly static) argument structures 'const'. Signed-off-by: Jan Beulich --- xen/arch/ia64/xen/hypercall.c | 5 +---- xen/arch/x86/x86_32/traps.c | 2 +- xen/arch/x86/x86_64/traps.c | 2 +- xen/include/public/xen.h | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c index 8a30802c6e..33e61b4052 100644 --- a/xen/arch/ia64/xen/hypercall.c +++ b/xen/arch/ia64/xen/hypercall.c @@ -34,9 +34,6 @@ #include #include -extern long do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg); -extern long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg); - static IA64FAULT xen_hypercall (struct pt_regs *regs) { @@ -457,7 +454,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg) /* First time to add callback to xen/ia64, so let's just stick to * the newer callback interface. */ -long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg) +long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg) { long ret; diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index 64afdee5db..0106081cdd 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -419,7 +419,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg) } -long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg) +long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg) { long ret; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 4df88dbb3d..3cf5359fdc 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -470,7 +470,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg) } -long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg) +long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg) { long ret; diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index a3b1d2fc3f..52c61a2eb3 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -48,6 +48,7 @@ __DEFINE_XEN_GUEST_HANDLE(uint, unsigned int); DEFINE_XEN_GUEST_HANDLE(long); __DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long); DEFINE_XEN_GUEST_HANDLE(void); +__DEFINE_XEN_GUEST_HANDLE(cvoid, const void); DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); #endif -- 2.30.2